From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 15 Nov 2018 17:47:55 +0000 (+0100)
Subject: ibusManager: Don't pass undefined callback to ibus
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~897^2~1^2~34
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=74bb9e62492bacda372904d30891eb97685e9b0c;p=gnome-shell.git

ibusManager: Don't pass undefined callback to ibus

Since commit 551e8278416, we don't always pass a callback parameter.
However passing it on as undefined to ibus doesn't work, as gjs doesn't
accept that as a valid callback value and throw an error. As a result,
we can end up with no layout selected in the keyboard menu and an "empty"
indicator. Fix this by explicitly passing null if no callback has been
provided.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/293
---

diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
index 34f198c35..33ad8777e 100644
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -210,7 +210,7 @@ var IBusManager = new Lang.Class({
         }
 
         this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
-                                           null, callback);
+                                           null, callback || null);
     },
 
     preloadEngines(ids) {